removed merge marker
merge conflict solved