fix for running
merge
merge with conflict