middle step
resolved conflicts, working file
resolved more conflicts