lets get the merge correct this time