am to pm
fixed conflict manually