added fonts in assets pipeline
solved conflicts