fixing merge - 1