Conflict check in somehow.... #3594