#90
#90
#90
Merge pull request #92 from dotCMS/issue-90-unable-to-push-HTML-page-after-fixing-conflcits

Issue 90 unable to push html page after fixing conflcits