Fixed tiny merge problem