Merged conflicts with Studio project