removed small conflict