Developer1: making a change
Developer1: Resolved conflict and added information