Just so I can pull...
Fixed minor conflicts