Resolved conflicts with myself and recommit