git strategy to prevent procfile merge