solving merge conflict for reals