local commit
local commit
local commit
merge applicationContext.xml