fixing merge - unmerging