initialize project
merger conflict resolved