resolve conflicts in rc1