Removed conflicts with master. Fixed long lines.