Resolved conflict...again