fix windrose conflict artifacts
fix windrose conflict artifacts

jonguan/cmpe275-proj1-windrose,jonguan/cmpe275-proj1-windrose,jonguan/cmpe275-proj1-windrose,jonguan/cmpe275-proj1-windrose,jonguan/cmpe275-proj1-windrose