file3 edited and commited from branch dev
merge conflict change
 commited from centos git