fix merge conflicts
fix merge conflicts

jirutka/gitlabhq,dreampet/gitlab,iiet/iiet-git,axilleas/gitlabhq,stoplightio/gitlabhq,iiet/iiet-git,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,dreampet/gitlab,stoplightio/gitlabhq,stoplightio/gitlabhq,t-zuehlsdorff/gitlabhq,jirutka/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,t-zuehlsdorff/gitlabhq,iiet/iiet-git,iiet/iiet-git,dreampet/gitlab,mmkassem/gitlabhq,mmkassem/gitlabhq,mmkassem/gitlabhq,jirutka/gitlabhq,t-zuehlsdorff/gitlabhq,jirutka/gitlabhq,dreampet/gitlab,axilleas/gitlabhq