Updated source Vapor changes and fixed conflicts