Corrected not resolved conflict.