error: Your local changes to the following files would be overwritten by merge: Running version 0.7.4