Merged local and upstream changes