Fixing merge issues