fixing merge stuff
now it works?