Commit from PC remerged