Fixed merge problem