Fixing merge issuse