Status added
Changed
Main file changed
Conflict solved