branch 2 file change
Post merge attempt

some changes made ti file, even tho git for windows said merge failed -
CAUTION!!!