I am making a conflict
resolved a conflict