Merge correctly this time I think