first page commit'
conflicts fixed