bashrc: removing stale merge marker that I missed in the last push