more shite
fixed merge conflict