initial project build
merging conflicts