make sure everything branches from master