FIXED MERGE ERROR