Resolve conflicts after project update.