gusteau re-activate commit
resolved merge conflicts