fixed goal show from merge conflicts