solved more merge conflicts