Test finished and edit README
Fix conflicts