Updated yml file
Fixed merged conflicts