resolved all merge conflicts
solved more merge conflicts
solved more merge conflicts ^^