merging and fixing