solved merge conflict in 'about us page'