changed new shit to something new
fixed merge conflict