readme changed to no boom
conflicts in merge fixed