Commit to fix merging problems