Going into a merge
Fixed merge conflict