Sorry, left a hanging reference to a merge marker in acquamanCommon.pri