Added some instructions
Conflicts solved