Fixing merge problem