Try to merge Wip with master