locations  and application name
merge conflict