Fixed possible cause of merge conflict