Set up project.
fixed merge issues.
Fix merge issues