Fixed conflicting merge manually