Resolved merging issue