Didn't mean to change anything. fixing mistakes...
Fixed merge conflicts