fixed bugs
more merge conflicts