Fixed collissions in merge