Fixed minor conflicts