Fixing merge problem ..