Removed conflicts
Added main page