repaired merge conflict of last commit and kept replacement of ; with ,