// fixs for merge