merging changes
editing master form todo
merging conflicts in master file