preparing for conflict armageddon
resolved merge conflicts