committing for gh pages
fixing conflict