Add bootstrap and makeup template
Fix conflict