finally fixed merging issues. Yay! project up and running.