removed conflicted line