Removed red/red conflicts