merge master after reset
delete two spaces
fixing conflect