Fixed Merge Conflict