Merge not working correct