add instructions
fix conflict