Fix merge bug part two