removal of temporary code for merging