solved conflicts after merging