Added and rm'd some people
Fixed merge conflict