revert merge strategy
new compile wip