merge conflict in profile.symlink