parse and search problems
merge resolved conflic