pushing from clone repo for merge with conflicts
merge with conflicts completed