c3
remove merge conflict