start module 5 in rake task
fix merge conflict