fixed conflicting merge changes