hotfixed
some changes for issue1
final changes for issue1
Merge branch 'issue1'
some changes
changed in same place
Merge branch 'mergeconf'
fatal changes all over the place in file
changes in master branch fatal
hz