Merge changes from desktop computer and format source code