merge conflict
completed the add edit delete of lot, no validation