Removed markers I forgot to remove during Conflict resolution in the last merge.