Removed forgotten merge conflict tags