finished resolve conflict
finished resolve conflict

jdimiceli/afraid-to-commit,AdamAdamAdamAdam/afraid-to-commit,Spanarchie/afraid-to-commit,bm3/afraid-to-commit,marbont/afraid-to-commit,josephfrancis/afraid-to-commit