remove bad conflict resolution
a few review fixes