Removed the GITX MERGE files and fixed a clearing issue with the template