forgot to adjust starting position for apartment during merge. incorrectly resolved functions.js conflict.