Removed small merge conflict