added line path
conflicts resolved