Got rid of git merge notations. oops