solved conflict in buildfiles; added missing files