Fix the order of clearing a satellite
Merge pull request #3242 from murank/fix_failure_of_checking_merge_requests

Fix failure of cheking a merge request after conflict.