fixes on medbay building
fixed merge conflicts