first edit 2nd edit from local 2nd edir from remote ljkvkjd jhxzvhjv hjvbkx changesfrom dev branch jvhj kjfbvk nbk