modified

merging not working properly
humm?