Fixed conflicted files from about-merge