again fixing merge conflict