Conflict style test visual fix