had some problems with merging in git. project should build now