app section created
conflicts removed and merge code successfully