Fixed stale characters left over from merge conflict resolution