Local changes
Fixed some stupid conflicts