Yes, please do. This increases chances that we only have to do it once ;-) Ping me when you pushed, then I'll pull. Just to make sure, your current local is without the merge conflicts / clean, right?