Do a hard pull to avoid conflicts