Fixed a merge thing