merging gone wrong a bit