Removed some gunf from a merge conflict