DEV1 add something
DEV2 edit file1
merge on master