checking conflicts
Merge pull request #5 from alpdigital/adam2

checking conflicts