Merge properly this time