Resolved merging errors