removed merge conflict in about page