Fixed merge conflict
resulting from @dretrex and @helfrij trying to add differnt code to the
same line in AMDatamanAppController...