Fixed the merge issues

I hope