my-website Updates For new branch Merge conflict more tweeks Updated master branch on github Problem here Changes here