rqt_top) Revert the files that were lost by merging conflict.