Pre-resolve conflicts from dev