abac
merge conflict resolution
Merge pull request #7 from awaelchli/master

resolved merge conflict