it didn't need a history merge just a regular merge so i was able to get it done