solved conflict for merging