[FIXED] Merge Conflict