Fixing merge problem
Fixing merge problem