Fixed merge problems

I still don't know how to merge branches properly...