This file removed -- temp file created by sublime/mergetool. Should not have been committed.