Fixed merge changes