fixing conflicting merge