1. Fixed merge conflicts