fix dating and helper method
fixed conflict