Merge "Fix: Change the maven settings file"