DAL file merge conflict resolved. Removed .pyc files