resolve merge conflicts in css