fixed goal delete button
resolve conflicts
resolved some conflicts and cleaned database