Updated application files
fixed merge conflict