Resolved Conflict: Keeping changes