Fix merging conflicts