Fixing Conflicts before merge