added bottom line
fixed second conflict