Modfiy for merge