updated year on files
fixed conflict