Removed merge leftover files; updated .gitignore to ignore .orig files