Fix conflict error if there are unstaged changes, fix auto behat commands