Unresolved symbols and conflicting types on master branch !