resolve merge conflicts: now checking in the right files