added folders and db.properties
conflict resolved.