branch added and MergeConflict.txt edited
Merge branch 'part1.3'

Merging branch with master
fix master, before merge