fixed issues with the line following code that resulted from merge confilcts