changed some and added a line
fixed the mergeconflict