cleaned up main and removed git merge conflicts