Finished merging conflick