Merge and resolve issues