fixed conflicting merge script