conflicts solid y
