trying to get the merge ok