resolve more merge conflict