Finished merging conflicts