fix conflicts
remove whitespace