Rebuild
Remove leftover >>> characters from old merge conflict