Conflict stuff fixed