Resolve conflicts
Costmap Compiles
Updated to Groovy Plugin stuff