Develop??

I do not understand why all these commits are here? I can't see any conflicts but be advised!