Change about to aboutme
Fix merge conflicts