solved more conflicts by copying from other branch