Color edit
Layout conflit merged