indent error on top
conflict resolution for top