Resolved merging issues