first commit
frame work setup
added a new file
dev1 file1 changes
added new file
merge conflict resolve