Resolved more conflicts