commit before pull
comit after pull conflict resolved
romoved LightActivity