#1: resolve conflictions