added line of merge conflict
resolved conflict
deleted