fix errors in manual conflict resolution