merge problem fixed