merge problem fix