re-commiting after fixing merge error from earlier today