Upstream Pull. Integration with Maven and conflict resolution