enterでlsとgit st
merge