force conflict to test emacs mergetool
Merge branch 'conflict_branch'

Conflicts:
	rhel/.bashrc
conflict 1