getting everything up to date
fixing merge conflict
fixing main content layout