Fixed merged conflict.