Changed git remote working diretory to main app directory.
Merging conflicts.
Made git working directory main app directory.