remove main
remove conflicts