Got build status working
Fixed merge conflict