Fixes merge conflict

Makefile

@@ -21,13 +21,13 @@ install :; forge install dapphub/ds-test && forge install rari-capital/solmate &
 update:; forge update
 
 # Builds
-build  :; forge clean && forge build --optimize --optimize-runs 1000000
+build  :; forge clean && forge build --optimize --optimizer-runs 1000000
 
 # Tests
-test   :; forge clean && forge test --optimize --optimize-runs 1000000 -v # --ffi # enable if you need the `ffi` cheat code on HEVM
+test   :; forge clean && forge test --optimize --optimizer-runs 1000000 -v # --ffi # enable if you need the `ffi` cheat code on HEVM
 
 # Generate Gas Snapshots
-snapshot :; forge clean && forge snapshot --optimize --optimize-runs 1000000
+snapshot :; forge clean && forge snapshot --optimize --optimizer-runs 1000000
 
 ## Pre-commit hook
 precommit: snapshot

frontend/types/nftTypes.ts

@@ -0,0 +1,57 @@
+// declare modules here
+
+export interface NftSpecification {
+    nftCollection: string;
+    nftId: string;
+}
+
+export interface RentContract {
+    lenderAddress: string;
+    borrowerAddress: string;
+    startDate: Date;
+    dueDate: Date
+    rentalPayment: number;
+    collateralPayoutPeriod: number;
+}
+
+export interface AvaliableDates {
+    startDate: Date;
+    endDate: Date;
+}
+
+export interface Listing {
+    name: string;
+    description: string;
+    datesForRent: AvaliableDates[];
+    pricePerDay: number;
+    collateral: number;
+}
+
+export interface Nft {
+    contract?: RentContract;
+    listing: Listing;
+    nftSpecification: NftSpecification;
+}
+
+export enum AvaliabilityStatus {
+    Avaliabile,
+    Unavaliabile,
+    Rented,
+    Upcoming,
+}
+export interface Avaliability {
+    status: AvaliabilityStatus;
+    AvaliabiltyDate?: Date;
+}
+
+export interface Attribute {
+    traitType: string,
+    value: string,
+}
+
+export interface NftWithMetadata {
+    nft: Nft;
+    image: string;
+    avaliability: Avaliability;
+    attributes: Attribute[];
+}