line4 added
confilct fixed