Added push default to simple
Resolved merge conflicts