fixing mess caused by diff