removed leftin merge conflict