example setup files
resolve merge conflicts