minor cleanup
clear merge conflict