error: The following untracked working tree files would be overwritten by merge: