Fixed trouble merging