Repaired merge inexperience/stupidity