resolve apel merge conflict